Skip to content

PR #1538 merge to dev/gfdl#47

Merged
adcroft merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
marshallward:main_to_dev_gfdl
Dec 21, 2021
Merged

PR #1538 merge to dev/gfdl#47
adcroft merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
marshallward:main_to_dev_gfdl

Conversation

@marshallward
Copy link
Copy Markdown
Member

Merge of the stochastic contribution (mom-ocean#1538) to dev/gfdl.

Resolved conflicts due to new stochastic arguments and transition of formerly optional arguments as mandatory.

jiandewang and others added 2 commits December 20, 2021 12:47
The stochastic physics feature has been added in MOM6. The following are from Phil Pegion:

The ocean stochastic physics has been re-coded such that there is a wrapper in config_src/external/OCEAN_stochastic_phyiscs that contains the calls to the external stochastic_physics repository. This has been added to support non-UFS applications of MOM6 where the stochastic_physics repository is not part of the build. The init and run procedures are called from src/core/MOM.F90. I have also created a new control structure stochastic_CS, which contains the logical variables, and random patterns which are then passed into src/parameterizations/vertical/MOM_diabadic_driver.F90 and src/parameterizations/vertical/MOM_energetic-PBL.F90.

The writing of the ocean stochastic restarts sit in config_src/nuopc_cap/mom_cap.F90

Co-authored-by: pjpegion <Philip.Pegion@noaa.gov>
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 21, 2021

Codecov Report

Merging #47 (baa0ea3) into dev/gfdl (d244246) will increase coverage by 0.00%.
The diff coverage is 35.77%.

❗ Current head baa0ea3 differs from pull request most recent head 9a5e218. Consider uploading reports for the commit 9a5e218 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           dev/gfdl      #47    +/-   ##
==========================================
  Coverage     28.96%   28.96%            
==========================================
  Files           240      242     +2     
  Lines         71222    71324   +102     
==========================================
+ Hits          20627    20660    +33     
- Misses        50595    50664    +69     
Impacted Files Coverage Δ
...external/stochastic_physics/stochastic_physics.F90 0.00% <0.00%> (ø)
...parameterizations/vertical/MOM_diabatic_driver.F90 38.83% <23.68%> (-0.43%) ⬇️
...c/parameterizations/vertical/MOM_energetic_PBL.F90 46.19% <45.45%> (-0.19%) ⬇️
...c/parameterizations/stochastic/MOM_stochastics.F90 52.27% <52.27%> (ø)
src/core/MOM.F90 58.74% <100.00%> (+0.02%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d244246...9a5e218. Read the comment docs.

@marshallward
Copy link
Copy Markdown
Member Author

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14404 ✔️ 🟡

New parameters:

  • DO_SPPT
  • PERT_EPBL

@adcroft adcroft merged commit bf43fd8 into NOAA-GFDL:dev/gfdl Dec 21, 2021
@Hallberg-NOAA Hallberg-NOAA added the enhancement New feature or request label Feb 1, 2022
@marshallward marshallward deleted the main_to_dev_gfdl branch March 8, 2022 19:49
uwagura pushed a commit to uwagura/MOM6 that referenced this pull request Nov 4, 2025
* port main rk loop

* typo and formatting

* delete nan inducing copy

* Dycore: NaN bugfix + minor diffs

* hp upload after zero-initialization was causing random errors, likely
  in halo values.  Now that zero-initialization is GPU-side, no need for
  upload.

* Some nested do-concurrents were consolidated

* Lots of whitespace fixes

* Dycore: Mem reduction, first pass

* Dycore: Mem cleanup second pass

* Dycore: memcheck 3

* dycore: memcheck next

* Dycore: memcheck, visc_rem and halos

* dycore: Keep dz on GPU

* Dycore: Remove [uv]_inst transfers

* dycore: cs%eta fully on gpu

* Dycore: Remove pbv copies

A small change, but seems correct.
pbv is input-only in step RK2, and is set outside in the main dycore
loop (on CPU), followed by an upload.

* dycore: memfix accel trim

* Dycore: move up, vp down

(and apparently an h download was redundant.  looks ok, but havent 100%
verified...)

* dycore: Shift accels later in loop

* dycore: tau[xy]_bot on GPU only

* Dycore: [uv]_inst moved outside loop

* Dycore: [uv]p, visc_rem_[uv] downshift

* Dycore: [uvh]_av, uh, vh downshift

Also some halo padding

* Dycore: Remove multiple forcing/hp updates

* Dycore: memfix [uv]_bc_accel

* Dycore: Remove u_accel_bt and eta_pred transfers

* Dycore: mem cleanup visc_rem_[uv]

---------

Co-authored-by: Marshall Ward <marshall.ward@noaa.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants